updated

2004-10-29  Hans Breuer  <hans@breuer.org>

	* gdk/makefile.msc gtk/makefile.msc.in : updated

	* gdk/win32/gdkdisplay-win32.c : dummy implementations for
	gdk_display_supports_clipboard_persistence, gdk_display_store_clipboard

	* gtk/gtkmodules.c : #include "gtkprivate.h" for GTK_LIBDIR

diff --git a/ChangeLog b/ChangeLog
index 25cf5d8d4a2dc8d061ddf71e1ee1761c8b300e98..962abfb05bb44250d626a512c9910882f2be94ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-10-29  Hans Breuer  <hans@breuer.org>
+
+       * gdk/makefile.msc gtk/makefile.msc.in : updated
+
+       * gdk/win32/gdkdisplay-win32.c : dummy implementations for
+       gdk_display_supports_clipboard_persistence, gdk_display_store_clipboard
+
+       * gtk/gtkmodules.c : #include "gtkprivate.h" for GTK_LIBDIR
+
 2004-10-29  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkclipboard.c (gtk_clipboard_set_text): Don't hardwire

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 25cf5d8d4a2dc8d061ddf71e1ee1761c8b300e98..962abfb05bb44250d626a512c9910882f2be94ac 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2004-10-29  Hans Breuer  <hans@breuer.org>
+
+       * gdk/makefile.msc gtk/makefile.msc.in : updated
+
+       * gdk/win32/gdkdisplay-win32.c : dummy implementations for
+       gdk_display_supports_clipboard_persistence, gdk_display_store_clipboard
+
+       * gtk/gtkmodules.c : #include "gtkprivate.h" for GTK_LIBDIR
+
 2004-10-29  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkclipboard.c (gtk_clipboard_set_text): Don't hardwire

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 25cf5d8d4a2dc8d061ddf71e1ee1761c8b300e98..962abfb05bb44250d626a512c9910882f2be94ac 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2004-10-29  Hans Breuer  <hans@breuer.org>
+
+       * gdk/makefile.msc gtk/makefile.msc.in : updated
+
+       * gdk/win32/gdkdisplay-win32.c : dummy implementations for
+       gdk_display_supports_clipboard_persistence, gdk_display_store_clipboard
+
+       * gtk/gtkmodules.c : #include "gtkprivate.h" for GTK_LIBDIR
+
 2004-10-29  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkclipboard.c (gtk_clipboard_set_text): Don't hardwire

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 25cf5d8d4a2dc8d061ddf71e1ee1761c8b300e98..962abfb05bb44250d626a512c9910882f2be94ac 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2004-10-29  Hans Breuer  <hans@breuer.org>
+
+       * gdk/makefile.msc gtk/makefile.msc.in : updated
+
+       * gdk/win32/gdkdisplay-win32.c : dummy implementations for
+       gdk_display_supports_clipboard_persistence, gdk_display_store_clipboard
+
+       * gtk/gtkmodules.c : #include "gtkprivate.h" for GTK_LIBDIR
+
 2004-10-29  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkclipboard.c (gtk_clipboard_set_text): Don't hardwire

diff --git a/gdk/makefile.msc b/gdk/makefile.msc
index 8baf9681869a66fac00aa37e1c07987387e5818a..ef3cec5278d899b935505235b243b998c65a513c 100644 (file)
--- a/gdk/makefile.msc
+++ b/gdk/makefile.msc
@@ -58,6 +58,7 @@ gdk-win32-backend :
 all: \
        ..\config.h \
        gdkconfig.h \
+       gdkalias.h \
        gdkenumtypes.h \
        gdkenumtypes.c \
        gdkmarshalers.h \
@@ -142,6 +143,13 @@ gdkenumtypes.c: $(gdk_public_h_sources) makeenums.pl
 gdkconfig.h : gdkconfig.h.win32
        copy gdkconfig.h.win32 gdkconfig.h
 
+gdkalias.h: gdk.symbols
+       perl makegdkalias.pl < gdk.symbols > gdkalias.h
+
+gdk.def: gdk.symbols
+       echo EXPORTS > gdk.def
+       cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 gdk.symbols >> gdk.def
+
 libgdk-win32-$(GTK_VER)-0.dll : $(gdk_OBJECTS) gdk.def win32\gdk-win32.lib
        $(CC) $(CFLAGS) -LD -Fe$@ $(gdk_OBJECTS) win32\gdk-win32.lib $(EXTRALIBS) \
        gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res \

diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 16a5127254163bb02bd60c37e084594623de1425..e2527d2ef3def91158e1a48114480cf5ced67a08 100644 (file)
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -369,3 +369,19 @@ gdk_display_request_selection_notification (GdkDisplay *display,
   GDK_NOTE (DND, g_print (" -> %s\n", ret ? "TRUE" : "FALSE"));
   return ret;
 }
+
+gboolean
+gdk_display_supports_clipboard_persistence (GdkDisplay *display)
+{
+  return FALSE;
+}
+
+void
+gdk_display_store_clipboard (GdkDisplay *display,
+                            GdkWindow  *clipboard_window,
+                            guint32     time_,
+                            GdkAtom    *targets,
+                            gint        n_targets)
+{
+  /* XXX: implement it (or maybe not as long as we don't support delayed rendering?) */
+}

diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index 51718c8e58a56bdd81e8d5972ad59df72c0d6716..0bec50a574cef4430c87b9e02bb1cfc8a7a20908 100644 (file)
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -25,6 +25,7 @@
 #include "gtkmodules.h"
 #include "gtksettings.h"
 #include "gtkdebug.h"
+#include "gtkprivate.h" /* GTK_LIBDIR */
 
 #include <gmodule.h>
 #include <pango/pango-utils.h> /* For pango_split_file_list */

diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 3aef0bdd740d8ddf3903dc3e5844b7cc37fda89b..523354af36a003b92eda27fe8b0aee8047a1bfaf 100644 (file)
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -103,6 +103,7 @@ gtk_OBJECTS =                                       \
        gtkeventbox.obj                         \
        gtkexpander.obj                 \
        gtkfilechooser.obj                      \
+       gtkfilechooserbutton.obj        \
        gtkfilechooserdefault.obj                       \
        gtkfilechooserdialog.obj                        \
        gtkfilechooserembed.obj         \
@@ -129,9 +130,9 @@ gtk_OBJECTS =                                       \
        gtkhscrollbar.obj                       \
        gtkhseparator.obj                       \
        gtkhsv.obj                              \
+       gtkiconcache.obj                        \
        gtkiconfactory.obj                      \
        gtkicontheme.obj                        \
-       gtkiconthemeparser.obj                  \
        gtkiconview.obj                 \
        gtkimage.obj                            \
        gtkimagemenuitem.obj    \
@@ -156,8 +157,10 @@ gtk_OBJECTS =                                      \
        gtkmenubar.obj                          \
        gtkmenuitem.obj                         \
        gtkmenushell.obj                        \
+       gtkmenutoolbutton.obj   \
        gtkmessagedialog.obj                    \
        gtkmisc.obj                             \
+       gtkmodules.obj  \
        gtknotebook.obj                         \
        gtkobject.obj                           \
        gtkoldeditable.obj                      \
@@ -184,6 +187,7 @@ gtk_OBJECTS =                                       \
        gtkseparator.obj                        \
        gtkseparatormenuitem.obj \
        gtkseparatortoolitem.obj \
+       gtksequence.obj \
        gtksettings.obj \
        gtksignal.obj                           \
        gtksizegroup.obj \